From: Chong Yidong Date: Wed, 7 Mar 2012 05:53:51 +0000 (+0800) Subject: * cus-start.el: Avoid x-select-enable-clipboard-manager warning on non-X platforms. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~522 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=da3ac73ce439bda4677e6560b25865c6608dac95;p=emacs.git * cus-start.el: Avoid x-select-enable-clipboard-manager warning on non-X platforms. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 21c1fa2d6c3..7e0c55a4484 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-03-07 Chong Yidong + + * cus-start.el: Avoid x-select-enable-clipboard-manager warning on + non-X platforms. + 2012-03-06 Glenn Morris * term/pc-win.el (x-selection-owner-p, x-own-selection-internal) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index a2ac7aa91e6..fbba49951d1 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -502,6 +502,8 @@ since it could result in memory overflow and make Emacs crash." (featurep 'ns)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) + ((string-match "clipboard-manager" (symbol-name symbol)) + (boundp 'x-select-enable-clipboard-manager)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol))